//
//  ViewController.m
//  gh
//
//  Created by boc on 15/11/9.
//  Copyright (c) 2015年 bocweb. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    self.view.backgroundColor = [UIColor redColor];    // Do any additional setup after loading the view, typically from a nib.
    //终端的使用
    /*Last login: Mon Nov  9 13:58:48 on ttys000
     bocdeMac-mini:~ boc$ ls ~/desktop/gh
     gh		gh.xcodeproj	ghTests
     bocdeMac-mini:~ boc$ cd ~/desktop/gh
     bocdeMac-mini:gh boc$ ls -a
     .		.git		gh.xcodeproj
     ..		gh		ghTests
     bocdeMac-mini:gh boc$ git init
     Reinitialized existing Git repository in /Users/boc/Desktop/gh/.git/
     bocdeMac-mini:gh boc$ git config -
     error: key does not contain a section: -
     bocdeMac-mini:gh boc$ git config -l
     user.name=liushengjie
     user.email=liushengjie@gmail.com
     core.repositoryformatversion=0
     core.filemode=true
     core.bare=false
     core.logallrefupdates=true
     core.ignorecase=true
     core.precomposeunicode=true
     bocdeMac-mini:gh boc$ git remote add origin git@git.oschina.net:lidongxiao12138/LDX.git
     bocdeMac-mini:gh boc$ git config -l
     user.name=liushengjie
     user.email=liushengjie@gmail.com
     core.repositoryformatversion=0
     core.filemode=true
     core.bare=false
     core.logallrefupdates=true
     core.ignorecase=true
     core.precomposeunicode=true
     remote.origin.url=git@git.oschina.net:lidongxiao12138/LDX.git
     remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
     bocdeMac-mini:gh boc$ git config user.name lidongxiao
     bocdeMac-mini:gh boc$ git config -
     error: key does not contain a section: -
     bocdeMac-mini:gh boc$ git config -l
     user.name=liushengjie
     user.email=liushengjie@gmail.com
     core.repositoryformatversion=0
     core.filemode=true
     core.bare=false
     core.logallrefupdates=true
     core.ignorecase=true
     core.precomposeunicode=true
     remote.origin.url=git@git.oschina.net:lidongxiao12138/LDX.git
     remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
     user.name=lidongxiao
     bocdeMac-mini:gh boc$ ls ~
     Desktop		Library		Pictures	diaosi.pub
     Documents	Movies		Public		liushengjie
     Downloads	Music		diaosi		liushengjie.pub
     bocdeMac-mini:gh boc$ cd ~
     bocdeMac-mini:~ boc$ ls -a
     .			.gemrc			Movies
     ..			.gitconfig		Music
     .CFUserTextEncoding	.ssh			Pictures
     .DS_Store		.subversion		Public
     .Trash			Desktop			diaosi
     .bash_history		Documents		diaosi.pub
     .cocoapods		Downloads		liushengjie
     .gem			Library			liushengjie.pub
     bocdeMac-mini:~ boc$ vi .gitconfig
     bocdeMac-mini:~ boc$ rm liushengjie
     bocdeMac-mini:~ boc$ rm liushengjie.pub
     bocdeMac-mini:~ boc$ ls -a
     .			.gemrc			Library
     ..			.gitconfig		Movies
     .CFUserTextEncoding	.ssh			Music
     .DS_Store		.subversion		Pictures
     .Trash			.viminfo		Public
     .bash_history		Desktop			diaosi
     .cocoapods		Documents		diaosi.pub
     .gem			Downloads
     bocdeMac-mini:~ boc$ cd ~/desktop/gh
     bocdeMac-mini:gh boc$ ls -a
     .		.git		gh.xcodeproj
     ..		gh		ghTests
     bocdeMac-mini:gh boc$ git config -l
     user.name=diaosi
     user.email=diaosi@gmail.com
     core.repositoryformatversion=0
     core.filemode=true
     core.bare=false
     core.logallrefupdates=true
     core.ignorecase=true
     core.precomposeunicode=true
     remote.origin.url=git@git.oschina.net:lidongxiao12138/LDX.git
     remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
     user.name=lidongxiao
     bocdeMac-mini:gh boc$ git branch
     * master
     bocdeMac-mini:gh boc$ git commit -m "111"
     On branch master
     nothing to commit, working directory clean
     bocdeMac-mini:gh boc$ git status
     On branch master
     nothing to commit, working directory clean
     bocdeMac-mini:gh boc$ git add .
     bocdeMac-mini:gh boc$ git push origin master
     To git@git.oschina.net:lidongxiao12138/LDX.git
     ! [rejected]        master -> master (non-fast-forward)
     error: failed to push some refs to 'git@git.oschina.net:lidongxiao12138/LDX.git'
     hint: Updates were rejected because the tip of your current branch is behind
     hint: its remote counterpart. Integrate the remote changes (e.g.
     hint: 'git pull ...') before pushing again.
     hint: See the 'Note about fast-forwards' in 'git push --help' for details.
     bocdeMac-mini:gh boc$ git pull origin master
     From git.oschina.net:lidongxiao12138/LDX
     * branch            master     -> FETCH_HEAD
     Merge made by the 'recursive' strategy.
     README.md | 1 +
     1 file changed, 1 insertion(+)
     create mode 100644 README.md
     bocdeMac-mini:gh boc$ git push origin master
     Counting objects: 36, done.
     Delta compression using up to 4 threads.
     Compressing objects: 100% (30/30), done.
     Writing objects: 100% (36/36), 10.52 KiB | 0 bytes/s, done.
     Total 36 (delta 4), reused 0 (delta 0)
     To git@git.oschina.net:lidongxiao12138/LDX.git
     35988a3..ad8dd2f  master -> master
     bocdeMac-mini:gh boc$ ls -a
     .		.git		gh		ghTests
     ..		README.md	gh.xcodeproj
     bocdeMac-mini:gh boc$ git add .
     bocdeMac-mini:gh boc$ git commit -m "222"
     [master c496efb] 222
     1 file changed, 1 insertion(+), 1 deletion(-)
     bocdeMac-mini:gh boc$ git status
     On branch master
     nothing to commit, working directory clean
     bocdeMac-mini:gh boc$ git push origin master
     Counting objects: 4, done.
     Delta compression using up to 4 threads.
     Compressing objects: 100% (4/4), done.
     Writing objects: 100% (4/4), 461 bytes | 0 bytes/s, done.
     Total 4 (delta 2), reused 0 (delta 0)
     To git@git.oschina.net:lidongxiao12138/LDX.git
     ad8dd2f..c496efb  master -> master
     bocdeMac-mini:gh boc$ 
*/
    
    
    
    
    
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end
